uncommenting this feature as it now works in production.
Merge remote-tracking branch 'origin/develop' into develop