merge change from scin