[PATCH v2 0/5] Fix Bug#12935 + cosmetic changes/enhancements