1.4 ticket 1150

(includes the other outstanding pull request (initialization of App_State::User)