Merge "BUG-731: fix duplicate entry warning"