forgot self for function definition
Merge remote-tracking branch 'upstream/dev' into dev