fixed buddies
Merge branch 'release/4.1.46'