Bringing otf correction to newest develop branch
Created by: AdityaSavara
A correction has been made to the otf propagation (from the kmos python2 develop branch merging into kmcos python3 develop branch).
This is a forward propagation of that correction to the newest develop branch.