Merge current 'dev' effort into 'master'

It’s works, deploys and have some improvements.