TVB-689 Integrate changes of Ciprian from GitHub