merge of ziggeo changes from commit 28ef11000fb69c48c542be4433f1d15fd795e484