he inboard limiters for ITER were initially designed on the assumption that the parallel heat flux density in the scrape-off layer (SOL) could be approximated by a single exponential with decay length λq. This assumption was found not to be adequate in 2012, when infra-red (IR) thermography measurements on the inner column during JET limiter discharges clearly revealed the presence of a narrow heat flux channel adjacent to the last closed flux surface. This near-SOL decay occurs with λq ~ few mm, much shorter than the main SOL λq, and can raise the heat flux at the limiter apex a factor up to ~4 above the value expected from a single, broader exponential. The original logarithmically shaped ITER inner wall first wall panels (FWPs) would be unsuited to handling the power loads produced by such a narrow feature. A multi-machine study involving the C-Mod, COMPASS, DIII-D and TCV tokamaks, employing inner wall IR measurements and/or inner wall reciprocating probes, was initiated to investigate the narrow limiter SOL heat flux channel. This paper describes the new results which have provided an experimental database for the narrow feature and presents an ITER inner wall FWP toroidal shape optimized for a double-exponential profile with λq = 4 (narrow feature) and 50 mm (main-SOL), the latter also derived from a separate multi-machine database constituted recently within the International Tokamak Physics Activity. It is shown that the new shape allows the power handling capability of the original shape design to be completely recovered for a wide variety of limiter start-up equilibria in the presence of a narrow feature, even taking assembly tolerances into account. It is, moreover, further shown that the new shape has the interesting property of both mitigating the impact of the narrow feature and resulting in only a very modest increase in heat load, compared to the current design, if the narrow feature is not eventually found on ITER.