Merge pull request from miteshashar/dev Basic corrections to address app bootstrap breaks