merge develop into master to fix side-by-side bug on some mobile devices