Merge remote-tracking branch 'pawel/merge_master_v4.1_with_new_plugins' into new-plugins-system
Merge remote-tracking branch 'pawel/new_plugins' into new-plugins-system