Implement a hack to avoid infinite recursion in custom builds.
Implement a hack to avoid infinite recursion in custom builds.
Merge stable branch to default.