RPV-302 - Fixing of export mask
Merge remote-tracking branch 'origin/develop' into develop