Hotfix/buspg 71