Merge "[OOM-CPMv2] Allow optional input parameters"