Issue #6921 Project routing logic added