CB-4872 - added os version and edition check