Finished MR review for Matej