ERT-605 Changes as requested by end users