Merge "Add shaker image" into release/2019.2.0