DC/Melanie | #4150 | Changes after merging enketo