[DF-4070] Improved error logging
Merge branch 'maps_versioning' into maps_test_00