align master to 0.8.4