3/ 0.3 - merge

5.8. 3/ 0.3 - merge#

cycle full