[sr-dev] git:master:b441903c: avp: removed history, coherent indentation