#11893 lisas changes