epk fixes

John Aziz requested to merge cypress_JA_epk_fixes1 into 2022.2

epk fixes

Merge request reports