Relevant commit: 52c41f886927cf62ed592ba7fec974eee6b16844