LPS-41418 and LPS-41638

/cc @topolik and @epgarcia