Merge branch 'debug_log' into sonots
Merge branch 'NaN' into sonots