Feature #5006: Fix merge issue