Merge "fix(build): remove handling of mandatory options" into integration