[DO_NOT_MERGE] card639 changes