Merge branch 'develop' into fix/tab-highlight

3 jobs for fix/tab-highlight in 2 minutes and 33 seconds (queued for 2 seconds)