Merge "Focus loss value takes into account previous loss"