Squashed merge of Kepa's copyField additions