[24.2] Build collection only if populated in collection builder

[24.2] Build collection only if populated in collection builder #30746