COLDBOX-409 #resolve #close
COLDBOX-408 #resolve #close