updates for 1.0.0-b3 to merge back