Various 1529-related stuff collected from private fork