Bugs/catch up with grizzly

This set of commits represents a pull of the grizzly branch into havana to catch up with changes made in grizzly since the havana branch was cut.

Closes-Bug: #1208979
Closes-Bug: #1231098
Closes-Bug: #1220876