BOS1403275 tested locally, to be tested on MAF dev (removed test lines)