Pull request for Vix-233