merge quentin update, playground-284