MAP-954: improved logging