o.c.nams: copy nams refactoring from ams_develop branch
Merge remote-tracking branch 'origin/rel15x_beta' into rel15x_beta
Merge remote-tracking branch 'origin/rel15x_beta' into rel15x_beta
Merge remote-tracking branch 'Desy-extern/rel15x_beta' into rel15x_beta
Merge remote-tracking branch 'origin/rel15x_beta' into rel15x_beta