Merge change 5906 into donut

* changes:
  resolve complex value in application context instead of system context.