Pre-merge stage collision fix
Merged anti-velcocat feature