Update base.txt
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
fix for non-public users