merge revision(s) 927308108cced69cae478798004524b9a5d2f252: [Backport #16764]
Fix source location of autoloaded constant [Bug #16764]
merge revision(s) 927308108cced69cae478798004524b9a5d2f252: [Backport #16764]