Merged changes from pro