minor cleanup of code -cut an obsolete, commented out var
add logic to do initial assignment preparation: place assigned first
Merge branch 'feature/BUG-10649' into develop