Pulled in changes from main Marlin branch