Mixed 1061 1064

This PR combines #1061 and #1064. Only for  FS demo 3 purpose.