Resolved conflicts when merging "library_conversion" branch