Merge branch 'test' into acceptance
Merge branch 'test' into acceptance
Merge commit '922db26aa06c6f88996faa6acc2d' into acceptance
Re: #1780 - fixed
Re: #1781 - fixed
Re: #1803 Moved hierarchy check to be included on model; removed javascript alert
Merge branch 'hotfix/1803-hierarchyMissing' into test