changes by dev merged in master