Since !884 (merged) and !885 (merged) have related changes, they were first merged into ast-1168-integration, so this MR can merge them together into master.
Edited by Maik Nijhuis
Since !884 (merged) and !885 (merged) have related changes, they were first merged into ast-1168-integration, so this MR can merge them together into master.