updating rc with latest changes on master