Merge pull request #1824 from antonio-nino-diaz-arm/an/move-dyn-xlat