Fixes for REP-24
Merge branch 'REP-24'