#Issue 1373

#Issue 0413

#Issue 0273