Merge changes for redirect into mario