Merge branch 'remove-unsed-info-fields-fn' into 'develop'