Prepare for OF 32

Prepare for OF 32