Addition to #846 and #855:#869

Merged

SrinivasanTarget merged 2 commits intoappium:masterfrom

TikhomirovSergey:master

Apr 18, 2018

Commits on Apr 13, 2018

Addition to #846 and #855:
TikhomirovSergey
committed

Commits on Apr 16, 2018

Addition to #846 and #855:
TikhomirovSergey
committed