merge from nico
1st merge from jibux