Merge Master into Release/Candidate #688