#Issue 024 & 0253

#Issue 0193

#Issue 0153