Merge "Renamed empty animation test function" into devel/master