Merged new_user_concept to staging (head)
First fixes