Merge master to peggy2

[codecov[bot]]

Codecov Report

Merging #3324 (b0127e5) into future/peggy2 (f6d12b6) will decrease coverage by 0.00%. The diff coverage is 50.52%.

@@                Coverage Diff                @@
##           future/peggy2    #3324      +/-   ##
=================================================
- Coverage          47.96%   47.96%   -0.01%     
=================================================
  Files                169      169              
  Lines              15024    14985      -39     
=================================================
- Hits                7206     7187      -19     
+ Misses              7385     7377       -8     
+ Partials             433      421      -12     

Impacted Files	Coverage Δ
app/setup_handlers.go	11.11% <ø> (+7.66%)	:arrow_up:
x/clp/abci.go	90.00% <ø> (+3.07%)	:arrow_up:
x/clp/handler.go	38.98% <0.00%> (ø)
x/clp/keeper/executors.go	57.83% <0.00%> (-0.44%)	:arrow_down:
x/clp/keeper/grpc_query.go	69.26% <0.00%> (ø)
x/clp/types/keys.go	71.42% <ø> (ø)
x/clp/types/msgs.go	31.55% <0.00%> (ø)
x/margin/keeper/legacy.go	24.71% <0.00%> (-0.87%)	:arrow_down:
x/margin/keeper/migrations.go	20.00% <0.00%> (+20.00%)	:arrow_up:
x/margin/types/msgs.go	26.96% <0.00%> (-2.30%)	:arrow_down:
... and 15 more