Pulled updates from code61