GPII-543: Fix merge policy issue [ugly way].
GPII-543: Fix merge policy [better way].