v1.3 commit again with latest fixes.