Merge migrations from 0028 to 0030

Please review.