Merge pull request #2563 from OffBase/master