Martin Yde - #8331, Added dependency on navigation