Considerable amount of code structure change, preparing for a new release