Mixed 1061 1064

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