Merge branch 'adamdruppe-application_fixes' into staging