Final updates for Award
Following manual merge