Align master to 0.7.2