V2.7.0.5 - task #372.