Merge branch 'hotfix/support_test_1.3.2'

* hotfix/support_test_1.3.2:
  Increase size
  add Singletoom
  last commit
  fix initialization
  fix compilation. Issue in test...
fix possible issue with export
Merge branch 'hotfix/export_issue_heap' into develop

* hotfix/export_issue_heap:
  fix possible issue with export