Style and bugfixes from devel

Merge request reports

Loading