Merge "[277422] Contributors and todo updates"