Make this a one liner
Merge branch 'master' into edge
This fn is no longer used
This fn is no longer used
Merge branch 'master' into edge