Stubbed functionality for user feature
Merge remote-tracking branch 'origin/develop' into develop