Refs#671