LPS-43226 Applying pattern to other instances