[Topia-commits] 03/03: Merge branch 'feature/3685' into develop (fixes #3685)