Merge branch 'catch_decoding_errors' into HEAD
Merge branch 'reset-password' into temp