Ktsstg pullback to dev

All the most recent changes in stg