[Lull/HFX-1195] Pick CA-135187 and SCTX-1616 fix from Creedence to tampa-lcm