Merge latest devel tree

This update doesn't contain any functional changes, just testing update + container image build + Dockerfile to create a container image.