Merge pull request #76 from eliagbayani/master

DATA-1352, DATA-1378, DATA-1369