Bug#0 merge patches of build

[self test   ] build pass