[sr-dev] git:master:d3d5ef92: Merge pull request #1013 from mslehto/hepv3