Partital code changes wrt 0e60594