CIDM-3877 updated disabing elements