Fix MapExtensions.getOption()
for nullable types
#2241
Merged
MapExtensions.getOption()
for nullable types
#2241