Updated to include HT5BP v4.2.0 changes