GPII-177: Missing change from the latest commit