Feature #1724
build