Merge branches 'block' and 'py-reserve'