LPS-40562 Improve usage of StringBundler