File Patch Baru
Revert "File Patch Baru"

This reverts commit 37eba54be4f50fbdcf1be9823256a710fd36d2e3.
Patch From Master
Merge branch 'master' into BranchBaru