advanced commit #QPT-80 fixed