Added blue changes from master