TAG RunControl-01-01-04 ************************ Tag in the main branch: - Reverted changes done in ADHI-3920.