Merged in latest changes