Merge branch 'bug#244' into 'v2.7.1'
Address bug#244 See merge request !47
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
Address bug#244 See merge request !47