Merge branch '391637-WebAdminLogging'