Tried fixing locking issue in swing client
Merge branch 'release' into develop