Updated to match Bravura 0.72.