Merge 0-1-stable from mdsol/crichton into mdsol-share/crichton develop

Title says it all! Syncing the private version of Crichton with the public.