reconcile requests

[kcazzatoCMAP]

there are a group of pull request assigned to me that are behind develop; at this point it is easier for me to just add the updated code to the current setup in one branch rather than trying to update the branches