Merge branch 'V5-6-patches' into V5-7-patches

* V5-6-patches:
  T065agentextend_sh_simple: Add a new regression test