Thanks @Manjit.Singh for working on the patch. There were some minor changes ...