Last 0151 compatible source, export for 2.0b7