Revert "Revert "Katana GA Update""

This reverts commit d2d4cb98254bb4434b4c3c386864ef3382fe390a.