Fix issuse with angular.
Merge branch 'develop'