More system integration work

This PR has changes related to further system integration work. See the messages for the particular commits for more details.