back merge changes (#170) * mbj36/2.0.9-patch-2.1 * fix: first inline comment when user does not have name (#169) * fix: first inline comment * remove logs * mbj36/2.0.9-patch-2.2 --------- Co-authored-by: Joshua Onwuzu <77381596+Joshua-onwuzu@users.noreply.github.com> Co-authored-by: Maitra Khatri <54719132+maitrakhatri@users.noreply.github.com>