AUI-1550

Hey Jon, these commits are the fix for LPS-42980