LPS-32315 Avoid unnecessary exception on Release creation
LPS-32315 Source formatting