[release] Regular merge of develop

Merged cylon-x requested to merge develop into master

Merge request reports