Attempt at adding additional check for IC2 api
Merge remote-tracking branch 'origin/develop' into develop