[DO NOT MERGE] An attempt at fixing #8316
DraftPublic

Authored by osa1 on Mar 27 2018, 1:22 AM.