[NUCCORE-1138] Backport from master