Somes uncommited changes for special project. - commit 32665b964adda
Modify filters to avoid creating new images. - commit e863277181e86260d