Update htaccess and SC edit.
Merge branch 'htaccess' into staging
Merge branch 'staging'