Merge "Reducing Node struct size" into devel/master