#601 Fixed options and option values merging