Merge pull request #778 from eimlav/update-limitations