TVB-72 Integrate changes made by Ciprian Tomoiaga on his GitHub form od framework_tvb.