LPS-51632 adapt from ee-6.2.x