Merge "Replace Suppliers for Boolean, Int and Float" into main