MR should have two or three commits when ready:
FEB 8_1
FEB 8_5
Redmine: Refs #3243 #3254
Of interest to: @fweig, @a.toia