Minor: fix name of asSet() method
(cherry picked from commit af3a214)
Minor: refactoring
(cherry picked from commit f4ed566)
Fixed bug: OMultiValueIterator serialized to empty collection
(cherry picked from commit dd7408e)