[*] Sync w/ Original 5.2 :)