set inline class
Merge remote-tracking branch '1-3-stable-p2/1-3-stable' into 1-3-stable