[sr-dev] git:master:81dd019c: Merge pull request #1157 from eloycoto/evapi