component 2017-06-02

@michael.wong has joined the channel