Hotfix/back See merge request !1336
tip-status See merge request !1335
Release/180420 See merge request !1334