Reverted change added logging
Merge branch 'develop'