further C4 adapter fixes and improvements
Merge branch 'mbst-1826-c4-ids' into stage

* mbst-1826-c4-ids:
  further C4 adapter fixes and improvements