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

* V5-6-patches:
  Fix test for com2sec6 access.