merged platform-admin