Inception of a branch associated with ticket #2377 and based on /NEMO/trunk@14118, and removal of two obsolete branches