Merge pull request #1902 from jts-arm/romlib

ROMLIB bug fixes