Re-exported the feature to get menu blocks right
Merge remote-tracking branch 'origin' into release