#21264354030754: Fix for the Build modules