Fix digi references location and do some spring cleaning (master version)
This is a manual sweep of !49456 (merged) where conflicts are fixed + some additional whitespace issues are fixed.
/cc @jchapman
This is a manual sweep of !49456 (merged) where conflicts are fixed + some additional whitespace issues are fixed.
/cc @jchapman