Features2x 2229673 rebased

Rebased pull request for features 2.x.