Kodi 17 SMB issues

I hope someone can help with this.

Ever since going to Kodi v17, I am getting SMB issues.
When adding a folder or even accessing a previously mapped (from Kodi 16) folder, I am getting connection time out errors. Either it will not pull up the available folders on the windows network, or re-connect and see files to a previously mapped folder (via previous version of Kodi).

I have cleared the cache and data, uninstalled and re-installed Kodi… no joy.

I have SPMC installed on my Shield TV and have since installed side-by-side to Kodi v17 on devices. SPMC have ZERO issues with the SMB connections, just Kodi v17.

I have attached a picture of the error. Not sure if I can (or how to) submit a log file for this.

Thanks in advance for any help!