Closes L2SDP-182, branch name should have been L2SDP-282. The work done on this branch is linked to L2SDP-282.