1.2 RC3 merge

All commits from nightly except the rc bump, ofc