Added lock timeout
Merge branch 'feature/RAZ-3433' into feature/develop-temp