Merge commit 'rajbot/newui' into newui