Merge branch 'feature/tps_scale_notification' into develop