Improvments

Merged Maxim Prozorov requested to merge improvments into main

Merge request reports