merge Stable to work branch