Removed another useless comment
Fixed small issue
Merge remote-tracking branch 'origin/develop' into deploy