Fix/framework headers workaround

Closed Julien Wadel requested to merge fix/framework_headers_workaround into release/4.3

Merge link at : 728

Merge request reports