FLOE-115: In progress commit