Merge "Fix dangling SingleImplementations left after class unloading" into pi-dev