Refactoring + First steps toward merging boundary implementations

7 jobs for advanced_streaming_extensions in 29 minutes and 41 seconds (queued for 3 seconds)