Merge "Added extra options for service users" into release/2019.2.0