Merge branch 'feature/dynamic-user-refresh' into 'develop'