Adding component information
specifying parameter type more restrictively
Annotating why PARAM_RAW is necessary
Merge remote-tracking branch 'upstream/master'