Merge ci branch into master

Please, merge ci branch into master