add more option to return remark
Merge branch 'feature-54502068' into Rails4