Issue #3620005: Remove deprecated control field

Closes #3620005

Merge request reports

Loading