Merge remote-tracking branch 'origin/master' into rkaraivanov/feat-slot-controller

Author: rkaraivanov