CRAFTERCMS-214
Adding more log statements
Merge remote-tracking branch 'origin/CRAFTERCMS-214'