Yesterday
merge from stringpool_warnings_investigation