Fix for [LMS-1528], plus Changelog entry for the related feature