Merge branch 'stable-3.4' into stable-3.5

* stable-3.4:
  Improve error message for a failed submission for FAST_FORWARD_ONLY

Release-Notes: skip
Change-Id: I536bcb49b2f1918592d7f1c0c2fb989390bdbfe8