Fixed the issue with reconfig/upgrade to v3.2.7 from previous version
When testing previous fix, factory's workspace had some lingering setup and missed one of the use cases
Merge branch 'v3/6943' into branch_v3_2