Initial check in

Initial check in for back port to Juno.