fix terminology
fix merge issues
debug
debug
debug
debug
debug
debug
debug
Merge branch 'dev' into stage
fix issues