Adding missing files from merge of 4.1 branch -> master