Merge "Fix the issue widget model issue"