Temporary build fix for the merged build