permetis etc
Merging conflicts
Fix conflict NSdefault_hooks
Fix conflict NSdefault_hooks
Bounded scalar ++