Fast forward to latest

Please review before merging.