Don't merge! ADEN-1236 Krux for mobile