Merge "fix for ns-instantiate-guide"