commiting bootstrap_30 updates