Merge "Recursive work app resolution" into main