fixes
Merge remote-tracking branch 'upstream/CORE15' into pr