It closes TENE-139 but relates to TENE-137, TENE-138 and TENE-144 too. All changes are in branch TENE-137.