merge latest changes form public branch