Merge "Optimize RTL properties resolution" into jb-mr2-dev