TQA-1248: update common and sample