Manual merge of branch feature-ux-december-look