A series of runtime-events fixes ported from upstream (#3596) #3880

Job	Run time
Check that resolved files build	24s
	24s

Provide feedback