IDEX-1275: applied user changes