Get PR 1745, fix for LMS-1492, onto rc branch