BIE-1123

Owned by vaonri@TH