[MERGE] Merge from trunk-wms-loconopmerge2 + only keep good optims