Merge remote-tracking branch 'origin/feature/full_ver' into feature/full_ver