Merge branch 'act_ife-fixes'