Merge branch 'pr-p4-r5-b1' into 'develop'

feat: P4 endpoints support and several bug fixes

See merge request !300