Merge commit 'ol/newui' into newui