Merge proposals dependent on lp://qastaging/~alan-griffiths/mir/hack-0.7-for-unity8-alternate

1. hack-0.7-for-unity8-alternate
2. Dependent merge proposals