add check for large messages
Merge branch 'testing_log' into AWS