118165 - implemented customs support; updated unit tests