fix map inicialization error in singles
Merge branch 'master' into rc
Merge branch 'rc' into stable