Background merge request for major P4 extensions. Covers:
Closes issues: #268 (closed) and #276 (closed)