Replicate changes from PA branch