[Topia-commits] 02/02: Merge branch 'feature/3768' into develop (closes #3768)