We need the messages so don't clear them
Update test gateway
Merge branch 'feature/1313-remove_temporary_use' into develop