Merge fix after QA: https://github.com/GluuFederation/gluu4/pull/530
Merge fix after QA: GluuFederation/gluu4#530