Merged rc files from new-ui branche.