Merge branches 'misc', 'qedr', 'reject-helpers', 'rxe' and 'srp' into merge-test