Follow-up lifecycle and security fixes#6

OneNoted merged 2 commits intodevOneNoted/taskers:devfrom

post-0-3-1-follow-upOneNoted/taskers:post-0-3-1-follow-upCopy head branch name to clipboard