Merge pull request #4371 from marek-safar/cecil-update