Issue 18394: Merged picker changes from pull request to master