Solve several issues found in stress tests#248

ajoaoff wants to merge 5 commits intokytos:masterkytos/mef_eline:masterfrom

ajoaoff:lock_issuesajoaoff/mef_eline:lock_issuesCopy head branch name to clipboard