commiting refs #1494 @2