Fix buffer value when none provided
Updated FOM release with latest develop