Removed function() which is only necessary for Master not Branch_3_5_x