1.3 sync with master repository