New platform settings pages
Merging