Merged with master and to freeze into precise version