added extra logging
Merge branch 'dev1'