@digdoug ,
Here’s a post with updates to the SP2 to SD3 template that I think you might find helpful: