BZ917877: Include GUVNOR-1853 to BRMS 5.3