Not sure what this commit is

Conflicts:
	zenstack/targets/nooptarget.py
Not sure what this commit is