Merge "Fixing mis-sorted modifiers." into jb-mr1-dev