Merge pull request #831 from eimlav/modules-8321