Merge "Fix included service handling"