Conf 25

Serafim Simonovrequested to merge
conf-25 into master

Update master before Declaration DSL development

Merge request reports