Merge platform less changes into platform-ui