Merge fix after QA: https://github.com/GluuFederation/gluu4/issues/524
Merge fix after QA: GluuFederation/gluu4#524