newrepot branch merged with master