Merge commit '08228fdaffd4b5d29e2b3172cc535b8e2c22baae' * commit '08228fdaffd4b5d29e2b3172cc535b8e2c22baae': Fix the shortcuts
Merge commit '08228fdaffd4b5d29e2b3172cc535b8e2c22baae' * commit '08228fdaffd4b5d29e2b3172cc535b8e2c22baae': Fix the shortcuts