Merge branch 'dev.af' into dev