Pulling in ldxe changes from sauk branch