Merge branch 'features/JAL-2435splitScreenFont' into develop