Wrong paths were being inserted leading to duplicates / missed properties. (cherry picked from commit 74edbdd4bc)
74edbdd4bc