Merged In latest changes from CM

Signed-off-by: pimpmaneaton <shaunsibu@gmail.com>