Fix rebase issues

2 jobs for !770 with work/thiago/morecomponents in 3 minutes and 50 seconds (queued for 2 seconds)
merge request