commiting refs #1503 @2