Merge "(GCC 6.2) Remove unused functions from automated-tests" into devel/master