LPS-41028 Add convenience method
 LPS-41028 Source formatting