Proposal to merge rc into master