[Topia-commits] 02/02: Fixes #3952 Merge branch 'feature/3952' into develop