Merge "Remove target preparer for epskc_enabled flag" into main