[sr-dev] git:5.0:645ac525: Merge pull request #1301 from oyvindkolbu/5.0