[3.0-devel 1/1] Quickfix of merge bugs