merge changes from uz-monitor