Merge locall changes with remote changes.

Christian Angyal requested to merge changes into dev-remote

Merge request reports