Manual SUPER merge commit to clobber develop w/ user_registration