LPS-31508

Hi @shuyangzhou 

please can you look if it doesn't break the parallel rendering?

Thank you!

/cc @rotty3000