LPS-50629 adapt from ee-6.2.x