Fix for branching logic in tracking core.

Changed "&&" to "||" as discussed yesterday in private conversations.

Includes !1903 (closed) and should be applied after the other MR is merged (bugfix is in the second-to-last commit here, see !1910 (0fb80229)).