[#31806] New context should be based on default context (Fix #1673)