o.c.(n)ams: Created new product configurations
Merge branch 'develop' into rel15x