Bugfixes/3.3.2 (see commit messages)