Merge changes up to VIC.4.1.2.k into develop branch.