Merge proposals dependent on lp://qastaging/~alexlauni/libunity/clear-models-on-vanish-859760

1. clear-models-on-vanish-859760
2. Dependent merge proposals