second merge from nucleus into master