Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev