LPS-41955 Long term fix
LPS-41955 Long term fix (regen)