Revert "Revert "Merge pull request #12892 from comoyo/value_selector_inputcontext""

This reverts commit 276838e60f34b3ec251fe7e39d6b7ae2935144f1.