SPEED-6 Fix regression saveinplace commercial_id