Merge branch 'release/2.21' into develop
warning option for timer
version & changelog
Merge branch 'release/2.22'