RPV-334 Log entry is disrupting save mechanism
Merge remote-tracking branch 'origin/release-1-1-4' into release-1-1-4