#305 Extra logging to track down the race condition in the Configuration persistence
Improved resilience when receiving a pending transaction
Merge remote-tracking branch 'origin/develop' into develop