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

This reverts commit a8606f77a25fab9497c7130eac6cf7a29a2783ac.