feature refs #363