Bug #1719, Feature #1720
build