Merge commit 'lance/newui' into newui