Merge remote-tracking branch 'ramsey/ready' into 11_eng