LPS-45843 Improve performance by not reading same properties multiple times
LPS-45843 Source formatting