Exception package fix
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	.idea/workspace.xml
Exception package fix