Merge of the three currently open PRs

for Testing.

+ build