LPS-38448 revert conversion to objects list just for primitives
LPS-38448 tests added
LPS-38448 Source formatting