feature #5157 fixing merge conflict