Merge branch 'hotfix/bug_abf'