OSNG-191

See https://jira.osiam.org/browse/OSNG-191