Merge into stable v3.3.3