PRD-3965 unified feature commit