Merge branch 'master' into wip_alan_T5681_fix_bootstrap4_detection