Merged pattern parameter fix into dev