LPS-36376 Keep backporting nice and simple
LPS-36376 SF