Fixes #1646
Fixes #1650
STAY replaced by EDGE in constants names
Companion part for #1646