Merge pull request #1290 from jeenu-arm/dynamiq