OA-236 Imported updated subroutine from TWFY code to resolve issue
OA-236 Imported updated subroutine from TWFY code to resolve issue

openaustralia/twfy,openaustralia/twfy,archoo/twfy,openaustralia/twfy,archoo/twfy,archoo/twfy,archoo/twfy,archoo/twfy,openaustralia/twfy,openaustralia/twfy,archoo/twfy,archoo/twfy,openaustralia/twfy