Merge "Fix for race condition in pollState" into atel.lnx.2.0-dev