force layout with collision detection
Merge commit 'be1d57feaa1b0a8ae120aa1650769781c086398b'