Temporary merge request to be closed once !454 (merged) is merged and master is merged again to future