Merge ShadedDimensions's PR into dev