All changes are on branch TENE-158.
Closes TENE-166 and already approved TENE-165; User story TENE-158.