Merge "Port admin actions extension to core API"