Stable 0.4 Merge, again...