diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
index 638cf68cf5..2115df5198 100644
--- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
+++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
@@ -893,7 +893,7 @@ public class IndexPlannerTest {
         FulltextIndexPlanner.PlanResult pr = pr(plan);
         assertTrue(pr.isPathTransformed());
         assertEquals("/a/b", pr.transformPath("/a/b/jcr:content"));
-        assertNull(pr.transformPath("/a/b/c"));
+        assertEquals("/a/b", pr.transformPath("/a/b/c"));
 
         assertTrue(pr.hasProperty("jcr:content/foo"));
         assertFalse(pr.hasProperty("bar"));
@@ -921,6 +921,30 @@ public class IndexPlannerTest {
         assertNull(plan);
     }
 
+    @Test
+    public void relativeProperty_WithFulltext() throws Exception {
+        IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
+        defnb.indexRule("nt:base").property("foo").propertyIndex();
+        defnb.indexRule("nt:base").property("bar").analyzed();
+
+        LuceneIndexDefinition defn = new LuceneIndexDefinition(root, defnb.build(), "/foo");
+        LuceneIndexNode node = createIndexNode(defn);
+
+        FilterImpl filter = createFilter("nt:base");
+        filter.restrictProperty("jcr:content/foo", Operator.EQUAL, PropertyValues.newString("/bar"));
+        filter.setFullTextConstraint(FullTextParser.parse("jcr:content/bar", "mountain"));
+
+        FulltextIndexPlanner planner = new FulltextIndexPlanner(node, "/foo", filter, Collections.<OrderEntry>emptyList());
+        QueryIndex.IndexPlan plan = planner.getPlan();
+        assertNotNull(plan);
+
+        FulltextIndexPlanner.PlanResult pr = pr(plan);
+        assertTrue(pr.isPathTransformed());
+        assertFalse(pr.evaluateNonFullTextConstraints());
+        assertEquals("/a/b", pr.transformPath("/a/b/jcr:content"));
+        assertNull(pr.transformPath("/a/b/c"));
+    }
+
     @Test
     public void relativeProperty_FullText() throws Exception{
         IndexDefinitionBuilder defnb = new IndexDefinitionBuilder();
diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
index a9edd08393..9a23cae5e1 100644
--- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
+++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
@@ -3265,6 +3265,51 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
         assertTrue("Injected def (" + defSeed + ")and clone (" + clonedSeed + " seeds aren't same", defSeed == clonedSeed);
     }
 
+    @Test
+    public void pathTransformationWithWildcardInRelativePathFragment() throws Exception {
+        IndexDefinitionBuilder idxBuilder = new IndexDefinitionBuilder().noAsync();
+        idxBuilder.indexRule("nt:base").property("foo").propertyIndex();
+        Tree idx = root.getTree("/").getChild("oak:index").addChild("fooIndex");
+        idxBuilder.build(idx);
+        root.commit();
+
+        Tree rootTree = root.getTree("/");
+        rootTree.addChild("a").addChild("j:c").addChild("foo1").setProperty("foo", "bar");
+        rootTree.addChild("b").addChild("j:c").addChild("foo2").setProperty("foo", "bar");
+        rootTree.addChild("c").addChild("j:c").setProperty("foo", "bar");
+        rootTree.addChild("d").addChild("e").addChild("j:c").addChild("foo3").setProperty("foo", "bar");
+        rootTree.addChild("j:c").addChild("foo4").setProperty("foo", "bar");//a document which doesn't have 2 levels above the property
+        rootTree.addChild("foo5").setProperty("foo", "bar");//a document which doesn't have 2 levels above the property
+        rootTree.addChild("f").setProperty("foo", "bar");//a document which doesn't have 2 levels above the property
+        root.commit();
+
+        assertPlanAndQueryXPath("//*[j:c/*/@foo = 'bar']",
+                "lucene:fooIndex(/oak:index/fooIndex)", asList("/a", "/b", "/d/e", "/"));
+
+        assertPlanAndQueryXPath("//*[e/j:c/*/@foo = 'bar']",
+                "lucene:fooIndex(/oak:index/fooIndex)", asList("/d"));
+
+        assertPlanAndQueryXPath("//*[*/*/@foo = 'bar']",
+                "lucene:fooIndex(/oak:index/fooIndex)", asList("/a", "/b", "/d/e", "/"));
+
+        assertPlanAndQueryXPath("//*[*/@foo = 'bar']",
+                "lucene:fooIndex(/oak:index/fooIndex)",
+                asList("/a/j:c", "/b/j:c", "/c", "/d/e/j:c", "/j:c", "/"));
+
+        assertPlanAndQueryXPath("//*[j:c/*/@foo = 'bar']",
+                "lucene:fooIndex(/oak:index/fooIndex)", asList("/a", "/b", "/d/e", "/"));
+
+        assertPlanAndQueryXPath("//*[*/foo1/@foo = 'bar']",
+                "lucene:fooIndex(/oak:index/fooIndex)", asList("/a"));
+
+        assertPlanAndQueryXPath("//*[*/*/foo3/@foo = 'bar']",
+                "lucene:fooIndex(/oak:index/fooIndex)", asList("/d"));
+    }
+
+    private void assertPlanAndQueryXPath(String query, String planExpectation, List<String> paths) throws ParseException {
+        assertXpathPlan(query, planExpectation);
+        assertQuery(query, XPATH, paths, false);
+    }
     private void assertPlanAndQuery(String query, String planExpectation, List<String> paths) {
         assertPlanAndQuery(query, planExpectation, paths, false);
     }
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
index 08196b428f..84de60f9f8 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
@@ -1027,10 +1027,13 @@ public class FulltextIndexPlanner {
         @Nullable
         public String transformPath(String path){
             if (isPathTransformed()){
-                // get the base path
-                // ensure the path ends with the given
-                // relative path
-                if (!path.endsWith(parentPathSegment)) {
+                // get the base path ensure the path ends with the given relative path
+                // for fulltext constraint.
+                // For non-fulltext constraint where query engine can evaluate the relative path
+                // condition, we shall take leeway and allow other features of query engine
+                // (like wildcard as a path element) get supported
+                if ( (!nonFullTextConstraints && !path.endsWith(parentPathSegment))
+                        || (nonFullTextConstraints && getDepth(path) < parentDepth) ) {
                     return null;
                 }
                 return getAncestorPath(path, parentDepth);