Backport 7659 stable6 2

refs #7659 

@karlitschek @PVince81 @schiesbn THX