Merge branch 'hotfix/bug_abf' into dev