fixes based on staged
fixes based on staged
Merge pull request #1639 from RickSaling/pushuser2

Fixes for 3.11.2 based on staged