Merge remote-tracking branch 'origin/fix/handle-no-mapped-id-and-cach…

…ing' into fix/handle-no-mapped-id-and-caching

# Conflicts:
#	app/routes/utils.py