Builder: Ported 23f0cc8 and d13a1b6