Follow up on #2676
Merge origin/newframework and fix conflicts
Merge pull request #2691 from bp323/2634FollowUp

Follow up on #2676