artf864555, artf864576 - Phresco to Phresco Adaption Bug Fixing