Merge "Fix multiple calls to set_[source/type]" into main