LPS-39013 6.1.x compat