This PR was created by multi-gitter to sync common-lib changes across multiple repositories.

Co-authored-by: prakhar katiyar <prkhrkat@gmail.com>