Mac2 change: should not be in master branch for now