Refs#BC-1147