plugin merge

Adrian Neubauerrequested to merge
Kevin-merge into nightly

Merge request reports