Bug 952985 - Context arguments broken due to optional list changes

[merge]