point the UI branch to master again for easier merge with core. This will break the UI tests