Merge branch 'bug/JAL-4368_default_colourscheme_applied_to_JVP_inappropriately' into...