Issue 3177 merge2.5