Bringing in the new features of the code into development and eventually main.
assigned to @kck540
mentioned in commit 4b5c18f7
merged
