Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev