This is based on Moonrise's 1.21.2 branch, but this on 1.21.1 so some diffs cannot be applied (and this doesn't compile). See moonrise_update_1_21_2.txt for progress
