issue 946 from partial develop fixes (markers update)

- this takes issue 951 and merges it without a full commit
- unlike 2.1.X markers does not evaluate expressions here