Merge "Add debug log" into devel/master