Merge "Improve resolution of RTL related properties" into jb-mr1-dev