D8 - minor and misc tweaks.
D8 - updating [#2145731]