added raise for function which will be removed soon
Merge remote-tracking branch 'origin/development' into development