LPS-45503 6.1.20 compat