Consolidated latest changes from Andy