sergei-startsev Review please

Should use async version for consistency