Merge of the #5311 and #4956