Add parts of previous pull requests, add local unique IDs and fix latest deprecation warnings

Add parts of previous pull requests, add local unique IDs and fix latest deprecation warnings #1313