Merge branch 'features/JAL-2773_dontalwaysrecolourstructureonrepaintofoverview' into...