Merge proposals dependent on lp://qastaging/~alan-griffiths/mir/spike-to-try-composition-bypass

1. spike-to-try-composition-bypass
2. Dependent merge proposals