Merge commit 'openlibrary/newui' into newui