pull Common.pm changes from FFI version