OGM-208 Option split - non compiling change proposal