[PATCH v2 0/3] Fix for BZ52048