Resolve hanssonr/2DV407#5