Added system property to enable the check.