Remove warning on non production version
Merge branch '1.0'