Fixed compilation issues, Dev Task : CSH-221, Dependant Dev tasks : CSH-360, CSH-361, Master SS Story : CSH-83