Fix stable environment error
Merge branch 'master' into staging for fix the fatal