Merge branch 't/afh_receiver'