merge from pershoot