[Lima-commits] 06/14: Merge branch 'feature/1381-fix-shortcut' into develop