Merge branch feature-omit-sequence into master