Merge proposed master into master

In order to align changes in proposed_master with master (the two have diverged)