Scope Evaluation Rework

resolves #13466