Syncing rangik enhancements to main.