Merge "Refactor code for unresolved field entrypoint."