I would suggest to try 2.3 for starters, although to be honest I’m not sure it will help. What might help is using the development branch -:
I would suggest to try this before going too much further - the downside is that you will need to delete and re-add the things (not exclude and include the devices to the controller - just delete and add).
