pull request from opntr@ukatemi