Porting upstream's b454d1a
Build