Re #1006 Fixed API Logging incompatibilities and git merging errors