Merged bugfix from 4.3.5