Merge "LayerStats: some changes for referencings" into pi-dev