Sync from ST

Did some modification portal-wise and decided to sync it in