merge
Solve merge with stage branch
different modules - refs BT#7729