Merge pull request #56694 from afreen23/wip-features-to-advanced