Merge changes from master to pointer