Bug correction in export
Merge branch 'master' into hkrs12

Merge bug correction in export functionality
Different bug fixes and improvements