Story 47789235: Ensuring that all boxed properties get put into model on update (may fix blank controls in selector dialot)