[SR-Dev] git:andrei/fixups: avp: comments fix