Con 1707

While we are not changing default setup, maybe we should not define it here?
Yep I know I started that in other modules ;)