Merge commit 'd18dc8c641cb4c89ffb205fb510e59a40ddf43fe' * commit 'd18dc8c641cb4c89ffb205fb510e59a40ddf43fe': resolve complex value in application context instead of system context.
Merge commit 'd18dc8c641cb4c89ffb205fb510e59a40ddf43fe' * commit 'd18dc8c641cb4c89ffb205fb510e59a40ddf43fe': resolve complex value in application context instead of system context.