Merge branch 'feat/wishlist-gui' into 'master'