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