Merge branch 'develop' of sso://edge/median-approx into develop