CFY-616 add version all around