Merge pull request #407 from lcdservices/4.3