Merge branches 'fix-wav-loading-REBASE' and 'add-google-test-REBASE' into integration-REBASE