PIM-3461: First working version