merged changes from P2 Responsive