QA-169
adding byon support