Merge remote-tracking branch 'origin/mr/41' into feat-variable-consistency

Conflicts:
	app/__init__.py
	app/templates/account/certify.html
1 job for feat-variable-consistency
Name Stage Failure
failed
linting Lint There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log