sync ProtoCore master->revist2015