Merge pull request #1843 from info-lvsys/patch-1