Merge proposals dependent on lp://staging/~therp-nl/therp-backports/server6.1-lp915975-related_x2m_writes_target_model_with_source_model_id

1. server6.1-lp915975-related_x2m_writes_target_model_with_source_model_id
2. Dependent merge proposals