Manual Merge of Vexatos' contributions