Merged bugfix for RT58553 from hotfix-1.15 to hotfix-1.16

Fix for RT58553 see #37