0401 repack propdev 2

Fixed conflict from a merged PR