LPS-36165 Source Formatting (as per Iliyan comments)