Re: Final steps for 1.6