Aligned with v 0.8.4