Merge pull request #84 from eliagbayani/master

DATA-1432, DATA-1430, COLLAB-914, follow-up DATA-1426
Merge remote-tracking branch 'upstream3/master'