fixed for edits for the 30.01
changes due to build 18.02