Merge branch 'master' into rewrite_of_cadet_test