Merge "Fix for volume output and Safety Level" into mnc-dr-dev