[JAC-164] JAC-164