Version 3.2 release branch

Closes all relevant other pulls #306 #307 #309 #310