Merge pull request #522 from lcdservices/4.3