LPS-37491 Avoid potential initial create race condition.
LPS-37491 SF