Merge remote-tracking branch 'origin/bug/JAL-3239monospacedEps' into develop