Backport changes based on 2nd feedback from DEV system