FIP-0047 and code are ready

FIP-0047 and code are ready