1.2.4 The rest of easy to merge stuff