Refs#BC-1638