Fixing logging message
Update merge from local master.