Merge "Revert "misc: Increase dynamic number space""