fix for slug problem default
Merge origin/develop into develop