Merge pull request #1786 from vhpoet/develop

[TASK] Coding style: Fix usage of 'finally' reserved word