Replace pairs fix and notRequired option
Replace pairs fix and notRequired option
Replace pairs fix and notRequired option
Replace pairs fix and notRequired option
Replace pairs fix and notRequired option
Merge pull request #1675 from mruz/2.0.0

Replace pairs fix and notRequired option