Merge commit '554f6cb1c7433449257d07d57e3d36cacb48fc70' * commit '554f6cb1c7433449257d07d57e3d36cacb48fc70': Add platform infrastructure for features.
Merge commit '554f6cb1c7433449257d07d57e3d36cacb48fc70' * commit '554f6cb1c7433449257d07d57e3d36cacb48fc70': Add platform infrastructure for features.