Merge "Remove commons-io dependency from models"