[PR][Stage_back][stage] Mkt-Def5 Update

Applied partial class changes to Def5