Closes STAT-314. To be continued on L2SDP-88
merged
mentioned in commit 75aad013
Looks good; merge accepted.