Sync rc.php_init_setup with master