merge Stable to working branch