Needed to finish task TENE-562. Unchecked squashing commits because first one should be picked in TENE-464.