Merge master into basic node transitions