Added missing function is_atomic()
Merge branch 'hotfix/6.1.7.1' into stable/6