1.4.1/2.4.1 Release - Upgrade path bug fix for 1.4.0/2.4.0 release