Hotfix/4.1.2.l

Merge Hotfix/4.1.2.l into master for VIC.4.1.2.l release