Merge "Revert "Removing unnecessary iconFactory class when generating b..."" into main