Merge Release/candidate back into develop

Should have been done since the 2.5 release