Merge branch '119_conf_option_preserve_attributes'