COUNTRY_CODE Fixes/SEC features from s3 kernel