[Topia-commits] 02/02: fixes #3742: merge branch 'feature/3742' into develop