Wip 9151 + 9152

Currently running fs suite against these changes on wip-jcsp-test