Merge pull request #7911 from elin-neo/elinf722_udpate_190327