Merge 3.2/master into 3.3/develop

Contains a duplicate code removal commit by @paulsschwarz