Fix: define new ref before trigger
Merge branch 'Upstream/develop'