Merge migrations 0017 0020

@xliiv @quamilek please review.