Fixed: Performance Issue with save