Merge branch 'amf/fix_search_space' into sprint47