Manually merged a2aa960bd1f12dfa78fdd739b1ffa699e9e532a9 from master
Manually merged 1e8f06f8dbd1f5c4f447c1bc60a60e600ad1b942 from master
Manually merged 45dd48d9a175e06bed60e1848b24722f955bd98c from master
Manually merged ddb7e4a8a12a270d184a7d811f3bd0fe9ff9b937 from master
Manually merged f97b5779e4d44205f49ef090ac23c7f0783e4793 from master
Manually merged 471ad36afabf567676979759b63e853e8299e086 from master
Manually merged 742c071697acf2c0f729d21a7ed02890816b88d5 from master