KP 73-74
Merge remote-tracking branch 'origin/dev'
Add redirice 301 for YAN