Merge "DO NOT MERGE : Add simple control request handling" into oc-mr1-dev