018.02 Updated edge from alden branch