Merge "Fix included service parsing (2/3)"