Merge "Bugfix: fix typo"