Task #125: Fixed merge v2