fix updated fillWithOld
Merge branch 'develop'