Ultimate merge of doom now on release. Second try!