safer cross mod interaction
Merge branch 'stable' into dev