Rajith_1.3.5: Manually merged sachini's branch "null"