Update subs logic
Merge remote-tracking branch 'UMS/web' into web