Devel to master

Prajkta Patkar requested to merge Prajkta_Patkar/gkcore:devel into master Aug 15, 2018