Merge of #3402