Added additional logging in order to get more info about 867
Merge origin/master