Merged feature/bokane/create_account and develop