Closes #2945.
Backported commits from !2049 (merged) and !2052 (merged):
9586dcad make splitOptions4 thread safe
4486a84a added ChangeLog entry
c024c6ae added extra coments
8fed22a2 addressed review coments
fa788456 clone options only once
76e1e3ae addressed review comments