TQA-1288:re-organize & push STOR_46,47,48