Merge Lodders Changes back into development