httpav-3423716/3423716-can-not-be-disabled: Done the changes and review the changes are working .

Closes #3423716 httpav-3423716/3423716-can-not-be-disabled: Done the changes and review the changes are working .