Merge branch 'master' into feature/stabilization
UIp-3125 calendar look bad when resize window
CAL-824 merge stabilization to master