LPS-41140 Add convenience method
LPS-41140 Source formatting