Change Details

todo

Depends on D3485 This is more like a best practice, but it's pretty important and may lead to unpleasant errors