added first commit to hotfix 5