Merge  OF OJK commit