LPS-38575 Forgot import
LPS-37352
LPS-37352 - Close regex block, remove redundant char checks