NXP-10216: backport complex property update optim into 5.4.2
NXP-9574: Make VCS row cache implementation pluggable
Merge branch 'NXP-10216-backport-5.4.2-complex-prop-optim' into 5.4.2