Feature #1708
build