Merged changes from MAX