FL-1750: added in other versions missing from previous commit