LPS-47251
LPS-47251 Improve performance
LPS-47251 Fix compile - missing import