[addressess #65836694] scotty information controller/  index action
Merge remote-tracking branch 'origin/develop' into develop