Merged with 1.3.4