Pulling updates from master to fork

Changes to GK and AS