Merge remote-tracking branch 'origin/contract/sato/1.0.300' into feature/contract/sato/1.0.300_51898_look_and_feel