Merge branch 'dev/cancelMapping' into dev/develop_bak

# Conflicts:
#	src/main/java/com/diagbot/util/CoreUtil.java