Removing not implemented exceptions
Merge remote-tracking branch 'origin/docker-grouping-merge' into docker-grouping-merge