fixed safe_log error in convert column method
Merge branch 'develop'