Merge "[1/n] Creates OptPropFactory to simplify OptIn and OptOut properties" into main