LPS-50263 move closer to first usage