LPS-45930 Service Builder bugs caused during the review process