Do not ignore normal shift patterns when shift patterns defined.

Give priority to shift patterns, but concatenate normal patterns.
Added test case too
Follow up c45465cc102001539c08b1820507e2806b1d574f
Merge remote-tracking branch 'upstream/master'