8.0 adapt code bootstrap

Merged Sebastian Kennedy requested to merge 8.0-adapt_code_bootstrap into 8.0-stage

Merge request reports