[git pull] feature/staging_sm5