Hotfix A3.
Hotfix A4.
Merge branch 'hotfixA4' into devel