EQ-1583 Replace deprecated APIs #33