Merge pull request #2 from rwijaya/MDL-27450