pull from origin/master: Fix for ISO_HJR string being too long