Merge pull request #848 from martynas-wm/v1.5.6.1

Issues #842 and #846