ianshward Use core context user page condition, update for latest features