Added merged changes from master to StageController