V1.3.3 pre

DO NOT MERGE YET.

Will be merged into master once v1.3.2 is released.