Merge mainline Synapse v1.21.2 into 'dinsic'.