Merge branches 'update-rd' and 'fix/137-id-column-as-factor-3'