MDLSITE-2913 First cut. WIP.