Merge of the three currently open PRs

for Testing.

+ build

I did not test this. Will do so tomorrow.