I201610221123
[506328] Use correct AS/CS element for markers
6 files changed