Phase2 hgx15

Built on top of pull request 4241 (Valeri's v5 version). Made all versions coherent