Merge branch 'amf/better_test_msg' into sprint73