Adds patch to solve LPS-42940