Updated
Cosmetic
Cosmetic
Fixed potential wrong alert id when empty
Prepare release
Merge branch 'master' into 1-5-stable