Merge remote-tracking branches 'merge-requests/6' and 'merge-requests/7'