Support for 2551 - migrate to proto#1