Fixed out of bounds bug.
Merge branch 'two/abdms/common_data_model' into development