Feature #1694
build