Feature #8725: fix merge changes