Merge pull request #937 from emmanuel-keller/1.6

Bug fix and improvement
Merge pull request #940 from emmanuel-keller/1.6

Implements #934
Merge pull request #943 from emmanuel-keller/1.6

Fix NPE on FilterList
Merge pull request #950 from emmanuel-keller/1.6

Update Monitoring task
Merge pull request #953 from emmanuel-keller/1.6

Fixes #947
Merge pull request #957 from emmanuel-keller/1.6

Implements #955