Fix dispatcher tweaks to correctly set application folder during short-circuit loads.
Loop until a valid controller is found.
Merge remote branch 'vanilla/master'