Merge branch 'main' into 'hamid'

# Conflicts:
#   myproject/debug.log
#   myproject/myapp/payments.py
#   myproject/myapp/urls.py
#   myproject/myapp/views.py