commiting refs #1500 @3