Fixes for REP-24

creating a test pull request