Merge "Fix remaining issue with bug #5904777"