removed notice
Merge branch 'release/1.5.21'