Merge with the modifications in master