Update to comply with parent repository (branch 3.3.5)