Re #1627 Fixing wrongly placed declaration
Merge branch 'v2.0.14'