Merge "Enforce load.php's no-session constraint"