add protected vars
Merge branch 'master' into ubuntu