@techee are you fine to have the commits squashed together or keep them as is or do you want to squash them yourself?
Just to make sure - are you really talking about this PR or rather #3055? No problem to squash them for #3055 but for this PR it's better to have commits separate IMO.