Both points will be in the next release of RS.