Added context info, such as filename, line, and function.
Merge branch 'feature/bandedo/add-context-info' into develop
Merge branch 'develop'