Freeze Break Request: update fas2.py overrides for ticket 5333