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